From 11525d747721b3d11cb937acfe670dcca6c7c2b8 Mon Sep 17 00:00:00 2001
From: "awilliam@xenbuild.aw" <awilliam@xenbuild.aw>
Date: Fri, 24 Mar 2006 10:36:14 -0700
Subject: [PATCH] [IA64] obvious compilation fix (hypercall.h, hypervisor.h)

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
---
 linux-2.6-xen-sparse/include/asm-ia64/hypercall.h  | 1 +
 linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h b/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h
index b260c56e76..c04317af6a 100644
--- a/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h
+++ b/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h
@@ -37,6 +37,7 @@
 #include <xen/interface/sched.h>
 #include <xen/interface/dom0_ops.h>
 #include <linux/errno.h>
+#include <asm/hypervisor.h> // for jiffies_to_st()
 
 /* FIXME: temp place to hold these page related macros */
 #include <asm/page.h>
diff --git a/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h b/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h
index 4a5f424417..279e3a3313 100644
--- a/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h
+++ b/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h
@@ -41,6 +41,7 @@
 #include <xen/interface/dom0_ops.h>
 #include <asm/ptrace.h>
 #include <asm/page.h>
+#include <asm/xen/privop.h> // for running_on_xen
 
 extern shared_info_t *HYPERVISOR_shared_info;
 extern start_info_t *xen_start_info;
@@ -52,8 +53,6 @@ int xen_init(void);
 /* Turn jiffies into Xen system time. XXX Implement me. */
 #define jiffies_to_st(j)	0
 
-#include <asm/hypercall.h>
-
 // for drivers/xen/privcmd/privcmd.c
 #define direct_remap_pfn_range(a,b,c,d,e,f) remap_pfn_range(a,b,c,d,e)
 #define	pfn_to_mfn(x)	(x)
-- 
2.30.2